From 72bbe655aea3a7ffa8c8985651590172a82f53db Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@gnu.org>
Date: Wed, 2 May 2012 21:06:50 +0800
Subject: [PATCH] Backport r108098 from trunk

---
 lib-src/ChangeLog     | 4 ++++
 lib-src/emacsclient.c | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 98a775ffa4d..9a3266a4c70 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-02  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (min): Undef before redefining it.
+
 2012-05-02  Jim Meyering  <jim@meyering.net>
 
 	* emacsclient.c (send_to_emacs): Avoid invalid strcpy upon partial
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 931f6d10c5c..c2b0a80c670 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -119,6 +119,9 @@ char *(getcwd) (char *, size_t);
 # define IF_LINT(Code) /* empty */
 #endif
 
+#ifdef min
+#undef min
+#endif
 #define min(x, y) (((x) < (y)) ? (x) : (y))
 
 
-- 
2.30.2